Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix The Game 🎉 #130

Merged
merged 63 commits into from
Oct 5, 2023
Merged

Fix The Game 🎉 #130

merged 63 commits into from
Oct 5, 2023

Conversation

DEATHB4DEFEAT
Copy link
Member

@DEATHB4DEFEAT DEATHB4DEFEAT commented May 8, 2023 •
edited
Loading

TODO

  • Give Boxers no shirt/socks
  • Bring back the good roundend sounds (currently I chose a couple of the new ones that I thought were okay)

Changelog

🆑

  • fix: Prescription glasses won't be given to people who aren't nearsighted
  • fix: Cabbages and Science crates won't sell for more than they cost
  • fix: Chargers won't give you the wrong circuit board when deconstructed
  • fix: Power outage will send an announcement when complete
  • fix: Shadowkin plushies are no longer pacified
  • fix: Happy Honk boxes should have items in them now
  • fix: Spells make you speak again
  • fix: Chemistry guidebookbook works
  • fix: Bluespace crystals use item space properly
  • fix: Round end announcements work

@DEATHB4DEFEAT DEATHB4DEFEAT added Status: Help Wanted Extra attention is needed Priority: 2-High Needs to be resolved as soon as possible Status: Do Not Merge Do not merge labels May 8, 2023
@github-actions github-actions bot added the Changes: C# Changes any cs files label May 17, 2023
@github-actions github-actions bot added Changes: Documentation Changes any xml or md files Changes: Map Changes any yml file in the Maps directories labels May 17, 2023
@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jun 9, 2023
@github-actions
Copy link

github-actions bot commented Jun 9, 2023

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Jun 12, 2023
@github-actions
Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jul 23, 2023
@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Sep 30, 2023
@DEATHB4DEFEAT DEATHB4DEFEAT added Priority: 1-Urgent Must be resolved immediately Size: Large For large issues/PRs and removed Status: Help Wanted Extra attention is needed Priority: 2-High Needs to be resolved as soon as possible Status: Do Not Merge Do not merge labels Oct 1, 2023
@DEATHB4DEFEAT DEATHB4DEFEAT changed the title uhhh try to fix tests Fix The Game 🎉 Oct 1, 2023
@DEATHB4DEFEAT DEATHB4DEFEAT marked this pull request as ready for review October 1, 2023 01:44
@github-actions github-actions bot added the Status: Needs Review Someone please review this label Oct 1, 2023
@DEATHB4DEFEAT
Copy link
Member Author

fake test fails jsndefjksdggskj

Pspritechologist
Pspritechologist requested changes Oct 1, 2023
View reviewed changes
Content.Server/StationEvents/Events/PowerGridCheckRule.cs Outdated Show resolved Hide resolved
Content.Shared/Roles/StartingGearPrototype.cs Outdated Show resolved Hide resolved
Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml Outdated Show resolved Hide resolved
Resources/Prototypes/SimpleStation14/Entities/Objects/Devices/Circuitboards/siliconchargers.yml Show resolved Hide resolved
Resources/Prototypes/SimpleStation14/Entities/Structures/Machines/silicon_chargers.yml Show resolved Hide resolved
Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/meta.json Outdated Show resolved Hide resolved
Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/meta.json Outdated Show resolved Hide resolved
Resources/Textures/Clothing/Uniforms/Jumpsuit/cluwne.rsi/meta.json Outdated Show resolved Hide resolved
Resources/Textures/Corvax/Structures/Machines/VendingMachines/ammo.rsi/meta.json Outdated Show resolved Hide resolved
Resources/Prototypes/SoundCollections/announcements.yml Show resolved Hide resolved
@DEATHB4DEFEAT DEATHB4DEFEAT merged commit b0db4a2 into master Oct 5, 2023
12 of 15 checks passed
@DEATHB4DEFEAT DEATHB4DEFEAT deleted the test-fixes-test branch October 5, 2023 01:37
SimpleStation14 added a commit that referenced this pull request Oct 5, 2023
@SimpleStation14
Automatic Changelog Update (#130)
de8e261
Pspritechologist pushed a commit that referenced this pull request Oct 11, 2023
@DEATHB4DEFEAT @Pspritechologist
Fix The Game 🎉 (#130)
338cbef 
# TODO

- [x] Give Boxers no shirt/socks
- [x] Bring back the good roundend sounds (currently I chose a couple of
the new ones that I thought were *okay*)

# Changelog

:cl:
- fix: Prescription glasses won't be given to people who aren't
nearsighted
- fix: Cabbages and Science crates won't sell for more than they cost
- fix: Chargers won't give you the wrong circuit board when
deconstructed
- fix: Power outage will send an announcement when complete
- fix: Shadowkin plushies are no longer pacified
- fix: Happy Honk boxes should have items in them now
- fix: Spells make you speak again
- fix: Chemistry guidebookbook works
- fix: Bluespace crystals use item space properly
- fix: Round end announcements work
Pspritechologist pushed a commit that referenced this pull request Oct 11, 2023
@SimpleStation14 @Pspritechologist
Automatic Changelog Update (#130)
9222c13
@Finket Finket mentioned this pull request Nov 6, 2023
Closed
24 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Pspritechologist Pspritechologist Pspritechologist approved these changes

Assignees
No one assigned
Labels
Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an rsi Holy Shit Priority: 1-Urgent Must be resolved immediately Size: Large For large issues/PRs Status: Needs Review Someone please review this
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@DEATHB4DEFEAT @Pspritechologist